Merge from emacs-23; up to r100582.
authorGlenn Morris <rgm@gnu.org>
Sat, 21 May 2011 02:15:34 +0000 (19:15 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 21 May 2011 02:15:34 +0000 (19:15 -0700)
commit6595b8b9d781aff5a02e56da6bacea7644704e97
tree7410f22baad5d12f7f59b376c3e70f3a0debff10
parent9ae8cfc31f6f549cef80107fbc414cea196472e9
parentaf0298a1fad43b8430b8781569eb1f30ecbdfa17
Merge from emacs-23; up to r100582.
src/ChangeLog
src/dispnew.c